Cleaned up grid code
package updates